From 4b1ec4c60ad721e7fa2161d32852ef0e45753daa Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Fri, 11 Mar 2005 00:28:04 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.43 (4230e614QJDirekggk8u5NMTqkptrQ) Update to Linux 2.6.11. Signed-off-by: Christian Limpach --- .rootkeys | 4 ++-- .../include/linux/highmem.h | 15 +++++++++++++-- .../mm/highmem.c | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) rename {linux-2.6.10-xen-sparse => linux-2.6.11-xen-sparse}/include/linux/highmem.h (88%) rename {linux-2.6.10-xen-sparse => linux-2.6.11-xen-sparse}/mm/highmem.c (99%) diff --git a/.rootkeys b/.rootkeys index 46d3689876..442995412d 100644 --- a/.rootkeys +++ b/.rootkeys @@ -128,8 +128,6 @@ 3e5a4e683HKVU-sxtagrDasRB8eBVw linux-2.4.29-xen-sparse/mm/swapfile.c 41180721bNns9Na7w1nJ0ZVt8bhUNA linux-2.4.29-xen-sparse/mm/vmalloc.c 41505c57WAd5l1rlfCLNSCpx9J13vA linux-2.4.29-xen-sparse/net/core/skbuff.c -42305f545Vc5SLCUewZ2-n-P9JJhEQ linux-2.6.10-xen-sparse/include/linux/highmem.h -42305f54Q6xJ1bXcQJlCQq1m-e2C8g linux-2.6.10-xen-sparse/mm/highmem.c 40f562372u3A7_kfbYYixPHJJxYUxA linux-2.6.11-xen-sparse/arch/xen/Kconfig 40f56237utH41NPukqHksuNf29IC9A linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers 40f56237penAAlWVBVDpeQZNFIg8CA linux-2.6.11-xen-sparse/arch/xen/Makefile @@ -250,9 +248,11 @@ 4122466356eIBnC9ot44WSVVIFyhQA linux-2.6.11-xen-sparse/include/asm-xen/queues.h 3f689063BoW-HWV3auUJ-OqXfcGArw linux-2.6.11-xen-sparse/include/asm-xen/xen_proc.h 419b4e93z2S0gR17XTy8wg09JEwAhg linux-2.6.11-xen-sparse/include/linux/gfp.h +42305f545Vc5SLCUewZ2-n-P9JJhEQ linux-2.6.11-xen-sparse/include/linux/highmem.h 419dfc609zbti8rqL60tL2dHXQ_rvQ linux-2.6.11-xen-sparse/include/linux/irq.h 419dfc6awx7w88wk6cG9P3mPidX6LQ linux-2.6.11-xen-sparse/kernel/irq/manage.c 40f56a0ddHCSs3501MY4hRf22tctOw linux-2.6.11-xen-sparse/mkbuildtree +42305f54Q6xJ1bXcQJlCQq1m-e2C8g linux-2.6.11-xen-sparse/mm/highmem.c 412f46c0LJuKAgSPGoC0Z1DEkLfuLA linux-2.6.11-xen-sparse/mm/memory.c 410a94a4KT6I6X0LVc7djB39tRDp4g linux-2.6.11-xen-sparse/mm/page_alloc.c 413cb1e4zst25MDYjg63Y-NGC5_pLg netbsd-2.0-xen-sparse/Makefile diff --git a/linux-2.6.10-xen-sparse/include/linux/highmem.h b/linux-2.6.11-xen-sparse/include/linux/highmem.h similarity index 88% rename from linux-2.6.10-xen-sparse/include/linux/highmem.h rename to linux-2.6.11-xen-sparse/include/linux/highmem.h index bbe2ce094e..54c3fa78af 100644 --- a/linux-2.6.10-xen-sparse/include/linux/highmem.h +++ b/linux-2.6.11-xen-sparse/include/linux/highmem.h @@ -9,8 +9,6 @@ #ifdef CONFIG_HIGHMEM -extern struct page *highmem_start_page; - #include /* declarations for linux/mm/highmem.c */ @@ -46,6 +44,19 @@ static inline void clear_user_highpage(struct page *page, unsigned long vaddr) smp_wmb(); } +#ifndef __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE +static inline struct page * +alloc_zeroed_user_highpage(struct vm_area_struct *vma, unsigned long vaddr) +{ + struct page *page = alloc_page_vma(GFP_HIGHUSER, vma, vaddr); + + if (page) + clear_user_highpage(page, vaddr); + + return page; +} +#endif + static inline void clear_highpage(struct page *page) { void *kaddr = kmap_atomic(page, KM_USER0); diff --git a/linux-2.6.10-xen-sparse/mm/highmem.c b/linux-2.6.11-xen-sparse/mm/highmem.c similarity index 99% rename from linux-2.6.10-xen-sparse/mm/highmem.c rename to linux-2.6.11-xen-sparse/mm/highmem.c index 96e7798983..846297fb25 100644 --- a/linux-2.6.10-xen-sparse/mm/highmem.c +++ b/linux-2.6.11-xen-sparse/mm/highmem.c @@ -53,7 +53,7 @@ static void page_pool_free(void *page, void *data) #ifdef CONFIG_HIGHMEM static int pkmap_count[LAST_PKMAP]; static unsigned int last_pkmap_nr; -static spinlock_t kmap_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED; +static __cacheline_aligned_in_smp DEFINE_SPINLOCK(kmap_lock); pte_t * pkmap_page_table; @@ -434,7 +434,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig, * at least one page was bounced, fill in possible non-highmem * pages */ - bio_for_each_segment(from, *bio_orig, i) { + __bio_for_each_segment(from, *bio_orig, i, 0) { to = bio_iovec_idx(bio, i); if (!to->bv_page) { to->bv_page = from->bv_page; -- 2.30.2